print qr
chengzhenyu
共有 5 个文件被更改，包括 10 次插入 和 12 次删除
+ 1
- 1
.idea/gradle.xml
@@ -5,7 +5,7 @@ |
||
| 5 | 5 |
<GradleProjectSettings> |
| 6 | 6 |
<option name="distributionType" value="LOCAL" /> |
| 7 | 7 |
<option name="externalProjectPath" value="$PROJECT_DIR$" /> |
| 8 |
- <option name="gradleHome" value="C:\Android\android-studio-2.2\gradle\gradle-2.14.1" /> |
|
| 8 |
+ <option name="gradleHome" value="C:\Android\android-studio\gradle\gradle-2.14.1" /> |
|
| 9 | 9 |
<option name="modules"> |
| 10 | 10 |
<set> |
| 11 | 11 |
<option value="$PROJECT_DIR$" /> |
+ 1
- 0
app/src/main/java/ai/pai/lensman/bean/OrderBean.java
@@ -2,6 +2,7 @@ package ai.pai.lensman.bean; |
||
| 2 | 2 |
|
| 3 | 3 |
|
| 4 | 4 |
public class OrderBean {
|
| 5 |
+ public String orderId; |
|
| 5 | 6 |
public String photoId; |
| 6 | 7 |
public String sessionId; |
| 7 | 8 |
public String buyerId; |
+ 6
- 9
app/src/main/java/ai/pai/lensman/service/OrderDealService.java
@@ -79,6 +79,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
||
| 79 | 79 |
OrderBean bean = new OrderBean(); |
| 80 | 80 |
bean.sessionId = orderObj.getString("session_id");
|
| 81 | 81 |
bean.photoId = orderObj.getString("photo_id");
|
| 82 |
+ bean.orderId = orderObj.getString("order_id");
|
|
| 82 | 83 |
JSONObject photoObj = orderObj.getJSONObject("group_photo_info");
|
| 83 | 84 |
bean.buyerId = photoObj.getString("user_id");
|
| 84 | 85 |
bean.buyerName = photoObj.getString("nickname");
|
@@ -103,8 +104,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
||
| 103 | 104 |
@Override |
| 104 | 105 |
protected void onPostFail() {
|
| 105 | 106 |
super.onPostFail(); |
| 106 |
- handler.removeMessages(MSG_QUERY_ORDER); |
|
| 107 |
- handler.sendEmptyMessageDelayed(MSG_QUERY_ORDER,10000); |
|
| 107 |
+ dealOrder(); |
|
| 108 | 108 |
} |
| 109 | 109 |
}.executeOnExecutor(ThreadExecutor.getInstance().getExecutor(), UrlContainer.QUERY_ORIGIN_ORDER_URL); |
| 110 | 110 |
|
@@ -343,6 +343,7 @@ public class OrderDealService extends Service implements Handler.Callback{
|
||
| 343 | 343 |
photoUploadUtils.addTextParameter("deleted", String.valueOf(0));
|
| 344 | 344 |
photoUploadUtils.addFileParameter("photo", photo);
|
| 345 | 345 |
photoUploadUtils.addTextParameter("user_id", bean.photoBean.lensmanId);
|
| 346 |
+ photoUploadUtils.addTextParameter("order_id", bean.orderId);
|
|
| 346 | 347 |
photoUploadUtils.addTextParameter("session_id", bean.photoBean.sessionId);
|
| 347 | 348 |
photoUploadUtils.addTextParameter("photo_id", String.valueOf(bean.photoBean.photoId));
|
| 348 | 349 |
|
@@ -365,13 +366,9 @@ public class OrderDealService extends Service implements Handler.Callback{
|
||
| 365 | 366 |
|
| 366 | 367 |
@Override |
| 367 | 368 |
protected void onPostExecute(Boolean result) {
|
| 368 |
- if (result) {
|
|
| 369 |
- LogHelper.d("OrderDealService", "上传 UploadTask " + bean + " success ");
|
|
| 370 |
- orderList.remove(bean); |
|
| 371 |
- dealOrder(); |
|
| 372 |
- } else {
|
|
| 373 |
- LogHelper.d("OrderDealService", "上传 UploadTask " + bean + " fail ");
|
|
| 374 |
- } |
|
| 369 |
+ LogHelper.d("OrderDealService", "上传 UploadTask " + bean + " success ");
|
|
| 370 |
+ orderList.remove(bean); |
|
| 371 |
+ dealOrder(); |
|
| 375 | 372 |
} |
| 376 | 373 |
} |
| 377 | 374 |
|
+ 1
- 1
app/src/main/java/ai/pai/lensman/utils/BoxUrlContainer.java
@@ -2,7 +2,7 @@ package ai.pai.lensman.utils; |
||
| 2 | 2 |
|
| 3 | 3 |
public class BoxUrlContainer {
|
| 4 | 4 |
|
| 5 |
- public static String BOX_IP = "192.168.8.100"; |
|
| 5 |
+ public static String BOX_IP = "192.168.8.101"; |
|
| 6 | 6 |
|
| 7 | 7 |
private static String BASE_URL = "http://" + BOX_IP + ":8002/"; |
| 8 | 8 |
|
+ 1
- 1
build.gradle
@@ -5,7 +5,7 @@ buildscript {
|
||
| 5 | 5 |
jcenter() |
| 6 | 6 |
} |
| 7 | 7 |
dependencies {
|
| 8 |
- classpath 'com.android.tools.build:gradle:2.2.0-rc1' |
|
| 8 |
+ classpath 'com.android.tools.build:gradle:2.1.3' |
|
| 9 | 9 |
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' |
| 10 | 10 |
// NOTE: Do not place your application dependencies here; they belong |
| 11 | 11 |
// in the individual module build.gradle files |